[CLEANUP] Mayor cleanup
Merge pull request #3 from Shade634/cleaning

[CLEANUP] Mayor cleanup