Minor clean up (still trying to fix infuser bug)