Made better use of the this pointer in situations where it is not immediately obvious we are referring to a member variable.  Also removed the second extra line after each file.