Improved code quality after checkstyle check