More organization and deleted code that needed to be redone