refactoring of instances and key shortcuts