Reorder config items. Refactor aliases