Fixed CheckStyle and FindBugs issues.