Changed to more idiomatic use of tuples over lists