whitespace and schema fix