* : Refactoring to improve maintainability and readability