Issue #117 Checkstyle fixes