Shrihari:Minor refacotrings and wirings
Shrihari:Removed a stray string