Code cleanup and tests checkstyle.