Improve maintainability
Briefly...