Fixed checkstyle and FindBugs errors