Refactoring and a slight Readme Change