Alterned some of the naming schemes and cleaned some more unneeded code.