'README' update, small refactoring and renaming.