quality-19 Refactoring
https://github.com/regidev/mte/issues/issue/19