Code cleanup
Bump version