A bit more pythonic

A bit more pythonic (working in progress)