Small refactoring. Version update