more checkstyle, several warnings i dont know how to fix or deal with