Issue #8: little refactoring