Refactoring and updat to readme