420 Refactoring