R6 model class greatly simplified