Checkstyle violation cleanup