Code tidy.
POM formatting, less dependency.