Made pythonic -- should work