Slight changes to choice making

code optimization