re #138 - refactoring