cleaning up and working on models