minor formatting changes
more cleaning up of sharedDAO methods