README updates and small refactoring.