INF-2529 Clean code, taking in account java best practices
Configured Sonar