Minor work on whitespace