Clean up code a bit

Bump version