Improved style with checkstyle.