Remove dead code
Clarify

Remove redundant visibility modifiers. Organise imports.