Clean up to use ?= instead of if
Update README.md