Move from magic numbers to arguments