removed unnecessary code to make it "cleaner"