CLEANUP checkstyle - fix warnings