[TASK] Improve code quality

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