Cleaning up Checkstyle violations from b1c16363