Refactor everything until your eyes fall out

Nothing really changed