637 Refactoring