Move of db activity to own namespace.  Format cleanup