cleaned up and normalized most of the schema