refactoring to level 1 - more to come
Authored by: vsp_neumann 2010-10-29
Parent: [r13214]
Child: [r13216]