A little refactoring
update readme