[TASK] Improve code quality

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