Tidyin' function
Now properly handling unavoidable clashes