Minor refactor and add resize update to model