Some edit on the README and clean up in the macro.