autit refactor 2x