Fix review comments - part 2
Fix review comments - part 2
derekjchow/models,derekjchow/models,derekjchow/models,alexgorban/models,tombstone/models,alexgorban/models,tombstone/models,tombstone/models,cshallue/models,cshallue/models,alexgorban/models,cshallue/models,tombstone/models,alexgorban/models,tombstone/models,alexgorban/models,cshallue/models,tombstone/models,derekjchow/models,cshallue/models,derekjchow/models