little refactor and readme update