Simplify reorient code