shorten more stuff
;