Minor clean up work.