[TASK] Improve code

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