Fix those horrible spaces