Updated readme, a little refactoring.