more refactoring
bump version