- Cleanup based on code review notes.