Clang Format & isl memory management fixes