formatting
grep feature
clean-up and docs