[TASK] Code clean up

Change-Id: I8c4f38dbb5237734cbbdc86244c8841ce7012ed4
Reviewed-on: https://review.typo3.org/26980
Reviewed-by: Fabien Udriot
Tested-by: Fabien Udriot