Switched to underscore_casing to match PEP8