cleanup
refactor where we setup the modelView Matrix