A little clean up to get it running.