Tidied up schema.sql.