clean up timestamp
Initial types cleanup
Initial reformat bson types