Minor clean ups in the DB file