couple more cleanups
clang format