Made r, p(e | x) and f instance variables