Refactor

In init