Minor refactor to be more PEP8