Remove some unused var and update the description