Simplify build target order