Refactoring code
bump version