Refactoring round two