Clean up a bit and bump version