Extra Refactoring