Few clean up changes and clang formatting