Slightly PEP-8-fying, but trying to save local coding style