Minor refactoring. README updates