re #78 - refactoring