restructuring occuring, removed all the other unnecessary code