Pep8 compliant
Removed deprications