refactoring for release 0.2.6