Reformat/Optimise imports

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Remove comments that keep of be reformatted

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Merge pull request #104 from sonatype/reformat-code

Reformat/Optimise imports