Remove magic numbers in favour of constants