Pylint/PEP8 cleanup for #15