Code refactorinf by Lint and IDEA recomendations