Whitespace
Remove unused code
Add final qualifiers
Code cleaning