Added a few matchers and fixed the foodcritic errors.