refactoring, minor changes/doc added
Authored by: rashid_waraich 2012-09-06
Parent: [r20880]
Child: [r20882]