Removed unused property & minor cleanup.