README minor changes and code cleaning.