Cleanup

variable names and commented old code changed