#20 little refactoring