Minor changes - cleaned up code.