Non-functional whitespace clean-up

Clean-up static imports where appropriate
Improve code syntax for constructors to make more clear the use of JcrTools
Clean-up whitespace formatting