Minor improvement

Nothing major, just looks cleaner
DB changes from last commit (?)
I'm tired, leave me alone