Improved to become pylint friendly