#86 Checkstyle error fixes