- Minor code review feedback changes