Readme, some refactoring