Whitespace and doc changes