various whitespace changes to reduce indentation and to better conform to