[TASK] Improve code quality

Change-Id: Id562a83c4a16ef46f7121465b014ceec76000f93
Reviewed-on: https://review.typo3.org/28984
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer