Got Rid of unneeded definitions and forced it into a module