Implemented changes suggested by Pylint