Update to Python conventions