Refs #133 - Fix PHPCS error and clean up code.