Refactoring... (take 2)