Code cleanup, checkstyle.