Added comment checking