model improved, tidy up