[TASK] More refactoring