[build] code simplification