formatting updates to Model API