673 Refactoring