Making the code nicer with checkstyle.