Minor refactorings. Readme file