Minor refactoring and changes to README.