Whitespace and header fixes