refactoring and README