Small refactoring and bumping version