Refactor noisemaker tools