Simplify input of tuples
Move stuff behind the courtain and remove unusef stuff