minor update
updated methodnames to more logic names and removed traces of old code not used anymore.