Refactoring pretty done. Not perfect by any means

The warping seems to be funny and I'm not sure all the changes I made were
positive ones.