Condensed code, again