refactoring. What the fuck was I thinking one year ago