refactoring for #15.