refactoring finish.
ver 0.2.0