Add mofifications for clang and cosmetics.