Renamed some objects and methods.  Cleaned up code.