Attempted to clean up schema to make it more readable.