Make comment functional