Optimized codes (imports, etc)

Code optimizations such as brace alignment, etc.  Imports optimized,
first stab at changing pom to allow differential patching and such.