More refactoring
Revised README