renamed and moved things around
resetting the database connection when needed