Made more pythonic :<