#16 checkstyle fixes