more yorick simplification and uniformization