whitespace and style fixes