shorten some more things up