Small code layout improvement and improved regex in _Output().
Small code layout improvement and improved regex in _Output().

djoudi/otrs-gitimport-test,djoudi/otrs-gitimport-test,djoudi/otrs-gitimport-test