Fixed houndci-detected issues.
Fixed houndci-detected issues.