Clean up + version update