Listed mods in alphabetical order
Minor refactoring