Fixed up code to pass checkstyles