357 Refactoring