Cleaning, pep8 and pylint changes