Refactoring and update of readme file.