Small refactorings. Readme for next blog