Minor refactoring and cleanup
Grammar and cleanup of README