clean up and get controller access to model properties