Checkstyle and FindBugs fixed