Using regex for parsin cl
Revert "Using regex for parsin cl"

This reverts commit df6d5d08e1da0842f220bd334eb74b0895b605bd.
Adding regex for parsing cl