Code Review cleanup.