refactor and wip readme