Improve structure, replace lists with tuples