Refactor
README update