re #33 - refactoring