improve PEP-8 / pylint improvements