Refactor

before only