--- a/+rv/+time/RungekuttaInteriorRv.m	Mon Feb 18 09:00:00 2019 +0100
+++ b/+rv/+time/RungekuttaInteriorRv.m	Tue Mar 05 10:53:34 2019 +0100
@@ -8,13 +8,6 @@
         coeffs  % The coefficents used for the RK time integration
         RV      % Residual Viscosity
         DvDt    % Function for computing the time deriative used for the RV evaluation
-
-        % Convenience properties. Only for plotting
-        viscosity % Total viscosity
-        residualViscosity % Residual viscosity
-        firstOrderViscosity % first order viscosity
-        dvdt % Evaluated time derivative in residual
-        Df % Evaluated flux in residual
     end
 
     methods
@@ -30,8 +23,6 @@
             obj.coeffs = struct('s',s,'a',a,'b',b,'c',c);
             obj.RV = RV;
             obj.DvDt = DvDt;
-            obj.dvdt = obj.DvDt(obj.v);
-            [obj.viscosity,  obj.Df, obj.firstOrderViscosity, obj.residualViscosity] = obj.RV.evaluate(obj.v,obj.dvdt);
         end
 
         function [v, t] = getV(obj)
@@ -40,15 +31,17 @@
         end
 
         function state = getState(obj)
-            state = struct('v', obj.v, 'dvdt', obj.dvdt, 'Df', obj.Df, 'viscosity', obj.viscosity, 'residualViscosity', obj.residualViscosity, 'firstOrderViscosity', obj.firstOrderViscosity, 't', obj.t);
+            dvdt = obj.DvDt(obj.v);
+            [viscosity,  Df, firstOrderViscosity, residualViscosity] = obj.RV.evaluate(obj.v, dvdt);
+            state = struct('v', obj.v, 'dvdt', dvdt, 'Df', Df, 'viscosity', viscosity, 'residualViscosity', residualViscosity, 'firstOrderViscosity', firstOrderViscosity, 't', obj.t);
         end
 
+        % Advances the solution vector one time step using the Runge-Kutta method given by
+        % obj.coeffs, updating the Residual Viscosity in each Runge-Kutta stage
         function obj = step(obj)
             obj.v = rv.time.rungekuttaRV(obj.v, obj.t, obj.k, obj.F, obj.RV, obj.DvDt, obj.coeffs);
             obj.t = obj.t + obj.k;
             obj.n = obj.n + 1;
-            obj.dvdt = obj.DvDt(obj.v);
-            [obj.viscosity,  obj.Df, obj.firstOrderViscosity, obj.residualViscosity] = obj.RV.evaluate(obj.v,obj.dvdt);
         end
     end
 end
\ No newline at end of file