Code review proposed changes