remove magic numbers in client code