simplify build a little