Seamless split and code cleanup