Clean up the code some more according to the linter.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>