Refactor this thing
Merge branch 'housecleaning'