#16 - fixed checkstyle errors