Did refactoring.

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>