chore(code-analysis) address some code anlaysis warnings.