Changed variables and arguments to better match model
If options already existed, the values were not changed
Clean up code