Made some clean up work.