Mayor refactoring