Self code review cleanup