re #81 - refactoring