find bugs and checkstyle changes