Formatting improvment, added db consolidation

Formatting improvment, added db consolidation