cleaned checkstyle and findbugs issues