Refactor AT