More refactorings. Update readme