Refactoring for first stable release