refactoring and ReadMe updated