[TASK] Cleanups for the classes

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