jax

720431d3 - code cleanup and formatting after code review