Some cosmetic fixes suggested by pylint