Non Sprint Task - fixed several checkstyle errors