Cleaning up the script and allowing for a larger set of options