build system: Improve build system