[TASK][CGL] Follow Flow best practices

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