Fix formatting
Fix terminate instances