Checkstyle Clean-up