Update. Minor cleaning.