Changed our comment structure