CLSN-564 Code Review Issues