[task] cleanup code and comments
Merge branch 'development' into MAGEMEP-23
[MAGEMEP-23] improved twig filter implementation