tidied up the models