Refactoring and README update