some refactorings and "load-balancing"
Authored by: vsp_neumann 2012-06-18
Parent: [r19962]
Child: [r19964]