VOYEUR: Get rid of some magic values