refactorings finished for today, more to come
Authored by: vsp_neumann 2012-09-03
Parent: [r20818]
Child: [r20820]