Implemented changes by pylint