Fixed default parameters for object.  Got rid extraneous code in master list