fixed whitespace and headers