Cleaning up a little, and adding some alternate command names using 'yeti' as 'sassquatch' is really awkward to type