split-mode cleanup and improvements