lets clean this up