Respect checkstyle rules. Fix some formatting issues.