Minor fix to remove magic numbers