Lets clean this up