Cleanup & database creation improvements