Initial clean up and introduction to model