Added type definition, renamed parameters.