Fixed checkstyle
Fix FindBugs errors