Refactor based on plan with Aran
Update README