minor improvements
model to view