Experimental refactoring complete