Refactor code
Bump version