Whitespace and minor stuff