Made modifications in accordance to checkstyles