Clean and add new comments according to improved network merge

Change-Id: Ie057a25a1408cf56734b36ec6c858d5e1b699590