Removed unneeded check in call method and renamed variable in choice class.