Clean up and bump version