Ar refactoring