Code consolidation and clean-up; README.md update.