340 Refactoring