improve build infrastructure