team code cleanup and review