Implemented Aaron's and pylint changes