Pylint inspired cleanup (#1070115)

Related: rhbz#1070115

Signed-off-by: mulhern <amulhern@redhat.com>