code clean up and added comments
Authored by: samantprajakta 2013-07-19
Parent: [r1084]
Child: [r1086]