clean code and update checkstyle config