Syntax change to work with python3; PEP8