clean code and change some checkstyle rule