Fixes some code issues presented in pull request review by @ToxicBakery.

Signed-off-by: Jared Woolston <jwoolston@tenkiv.com>