Minor improvements and checkstyle fixes.