Removing some unused code, cleaning up code structure, and fixing an incorrectly wired up Switch for the 2nd word