Fix comments issues reported by scrutinizer