Refactor
Refactor for starting value