[TASK][CGL] Follow Flow best practices

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