some stuff
clean UP
little refactoring