Fixed double dollar sign
Refactored rebuild-all