Reformatting of the persistance utilities module.