Made some updates for cleanup.