Added comment exception and tried to make comment typesafer