Tidy up refinement, use Plaza for 2D