Clean up, added bumpversion