[2566] Review - minor potential cleanups