refactorings, updated README