clearer `this` warning
more readable concatenation
update build