Whitespace modifications and minor stuff