[TASK] Minor code changes

Change-Id: If11c16f7cbbb6d299374fc6304f3262e1bbd29d7
Reviewed-on: https://review.typo3.org/25660
Reviewed-by: Nicole Cordes
Tested-by: Nicole Cordes