Refactoring. see #1