changed to follow PEP80