Cleaned up variables and getter/setter functions.  All private variables
should have both now with matching names.