Tidied up structure.sql