Refactoring & simplification
Refactoring