clean up for code quality issues reported by codeq.io