Organizing methods alphabetically. Removing empty classes