Harden code based upon CLANG