Streamline two shortcuts