A little bit refactoring - cleaning code
Added checkstyle and fixed all violations