readme, refactoring, simplifications