Testing out pylint, some refactoring