386 Refactoring