Update spaces, formatting