CLSN-591Code review