473 Refactoring