Update Readme, and refactor
