Refactored code. Fixed common link issue with comments node