Added more information to output
Fixed pep8 violations