removed global names (Tom's code review)