Refactor static numbers