[TASK] Some general fixing and cleaning/abstracting