Clang format and one structure change to avoid insane formatting.