refactor for #1