More comments and cleaning.