314 Refactoring