Refactoring.  Fixed up the readme