Jon Whitespacing cleanup