Clean up how it works and bump version