[#48] - Initial checkstyle fixes.