identation update and fix clang 3.3 warnings