Refactoring on major issues (checkstyle)