Switch to a coding style closer to PEP8