Key action works, refactor steps