further shorten some things