Models py tidy up