Refactoring and Bump version