Refactor and README update