OCD cleanup + refactoring