Minor changes, removed unnecessary code