refactor acotr2