Refactorize for fun, profit, and useability