fixed a bounch of checkstyle warnings