Do tropes fall under the cliche category or should we focus mainly on cliches?
That's perfectly fine.
