little refactoring, issue1#