[#48] - Fixed the remaining checkstyle errors.