Re-structure to conform to Python conventions