Revert "Changing way to create variable @comment"

This reverts commit f6d6a53e6631d85bd682890e078610d97320a801.
Revert "Revert "Changing way to create variable @comment""

This reverts commit a4bf2646d1150634c2941f3649e4863e6e463432.