[TASK] Refactoring: CGL compliance fixes

Change-Id: Ib85d4380279fcd8a19a9e9ecd14bf814df295dae
Reviewed-on: https://review.typo3.org/24586
Reviewed-by: Stefan Rotsch
Tested-by: Stefan Rotsch