More doc and cleaning.