Client cleanup

Just some changes to whitespace to make things consistent. There should be no code changes here.