V0.1 ~ small refactoring