some more updates refactoring db-related variables