sorted clang format and updated some options