Minor changes in names and removed unnecessary code