Slightly more pythonic I think?