little refactoring
refactor, bug fix