Repharse some of the shortcuts