Refactor to comply better with the Python coding standard.