refactoring grappa/clang