Identation and PMD recommendations.
Fixing second white tracker dependency.