Refactored to use new hash literal and remove 'y' and 'n' since they are only used on the command line version