Refactoring some more