[TASK] Small code cleanups

Change-Id: I81508e6bdff7666f390a10ef96717fd30db8df69
Reviewed-on: http://review.typo3.org/32784
Reviewed-by: Tim Lochmüller <tim@fruit-lab.de>
Tested-by: Tim Lochmüller <tim@fruit-lab.de>