Shortcuts, todo, name refactoring