Minor changes to variable names for clarity.
Simple model and some consistency tests