small clean up of variables in BuildHelper