code refactoring and stable release