Noralise a few of the magic numbers used in r114084