Pylint fixes (will squash)