Fixed issues pointed out by pylint