Some whitespace and pythonic updates. [1651]