Checking in some reonstucturing.