Good points. I will clean this up