Minor refactoring of some magic numbers