Modified header and removed trailing whitespace