Cleaned up the dbHelper some