refactor AT shortcuts