Checkstyle fixs and code improvement.