Refactored a bit
bump version