Refactor
ok