database simplifiation, style changes