clang cleanup