Encoding updated
Adopt couple more of pep8 suggestions