REFACTOR: issue #24