I definitely agree about magic numbers ...