Clean up code and versioning