Fixes #9

It is related to "copied code". I should never use number index in
string name. And should avoid copied code as much as possible.