update of readme + some refactoring