Fixed some Checkstyle and FindBugs errors