Addressed cl comments