concise key mapping
refactoring pt.2