renames handle_expand_shortcuts to expand_shortcuts
expand_shortcuts clean up