Fix checkstyle errors - closes #7