Storage: Clean up the table creation mess at the top, this should be much more readable and maintainable.