Agreed, I will clean this up