General cleanup
Bump version