Address outstanding TODOs following code review