TODO: Refactor code structure
Improve maintainability
