Added condtitional statement for comments