Minor clean up: pimp