minor refactor
merged with README.md changes