Some refact...devastation! :P