257 Refactoring