Refactoring database creation
Remove table name macros