MOdified small stuff after playing around with pylint