Refactor features on Readme