Remove magic numbers as per review