Checkstyle fixes
Sort entries by name