background and few clean up.