Cleaned up the use of java.lang Object types for primitive types.  Cleaned up some scoping on member variables across the code base.