Shorten code further