Made some changes to checkstyle configuration
Fixed some checkstyle issues