little refactoring done