[TASK] Code cleanups

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