code cleanup

(##55499468) recommendations by coffeelint
code cleanup

(#55499468) recommendations from coffeelint