Refactor the code to make it easier to add more options