cleaned up database queries