Minor simplifications for README and code