I think these issues are all whitespace. How do we clean this up?