Fix checkstyle, and removed illogial private in inner class