Refactor code
Update new formula