[TASK] Small cleanups

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