Code improvements.
Code improvements.

zammad/zammad,monotek/zammad,zammad/zammad,zammad/zammad,monotek/zammad,monotek/zammad,monotek/zammad,monotek/zammad,zammad/zammad,zammad/zammad,zammad/zammad,monotek/zammad