Removed tabs
Fixed indentation and pep8 issues