Clean up naming a tiny bit, remove extraneous conversion to option