removed 'magic' numbers