remove magic numbers - constants