[TASK] Code cleanups

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