#222 checkstyle fixes