Refactoring (see github issue #1)