Clean up re: refactoring