Refactor codebase

Some parts of the codebase can be refactored or improved in code structure

All issues for this milestone are closed. You may close this milestone now.