Refactor everything until your eyes fall out

again...