Made setup more pythonic