Fixed some checkstye issues and modified checkstyle rules