Refactoring
Closer towards full editability