Fix quality issues found by Sonar (member naming issues mostly)
Fix quality issues found by Sonar (bad names, unused imports etc.)
Format the code and organize the imports according to the coding style