Post-code review cleanup