[TASK] Fix several code style issues mentioned in scrutinizer

Change-Id: I44d527ae114306cbaf7984b00831f1a2af74dcb3
Reviewed-on: https://review.typo3.org/31395
Reviewed-by: Alexander Schnitzler
Tested-by: Alexander Schnitzler