Syntax improvements according to PEP-8.