more cleanup
clang format