Improve code maintainability