Cleaned up style issues reported by codeq