code clean up and minor method changes
Authored by: samantprajakta 2014-03-14
Parent: [r1865]
Child: [r1867]