[TASK] Improve code quality

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