Making everything more pythonic