Tidy up some things
Make model more useful