code style update, bring more into line with PEP 8