refactoring #98