Some spaces need to go