ICS4: some fixes & improvement + suggestions for channel upgradability (

#714)

* some improvements, fixes for readability and a couple of suggestions

* review comments

* review comments

* remove word

* renaming

* add dash

* fix typo

* remove empty line

Co-authored-by: Carlos Rodriguez <[email protected]>