README update and minor refactor