fix placeholder name more explicit, and refactor some code lines
v0.2.5