Refactor to simplify
ok