Remove unnecessary use of tuples