Checkstyle checker: cleanup.