Refactor
Bump version