I borked it

tried to get rid of some redundant codes, but i borked it