Refactor and update of readme