Reformat/Optimize imports
Merge pull request #85 from sonatype/reformat-2

Reformat/Optimize imports