Simplify code
Bump version