[TASK] Code cleanup according to metrics.typo3.org

Change-Id: Icbdb05afb397467396b8c6c3a1696b78a4cabb20
Reviewed-on: https://review.typo3.org/26530
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers