Fixed some of checkstyle errors