Minor changes (checkstyle and formatting).