Cleanup
Mmm
Relocate copy&paste...
Refactor things
Refactor
Destruct some code