Code cleanup

pep8 keeps getting stricter...

Change-Id: I910bddc6ac82e362863d60e22b5ffc5ad922f77a
Signed-off-by: Ryan Barry <rbarry@redhat.com>
Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>