Resolved checkstyle error on service layer and some of the utilities