Fix the codebase up so it passes code smells again

Codebase got pretty battered. Make it pass check-local.

Change-Id: If722aafb59c777b4f85dc07c3f50911ecfe96ae7
Signed-off-by: Ryan Barry <rbarry@redhat.com>