Some code cleanup (checkstyle).