+ removed unnecessary code