Add static methods, modify to conform to PEP8