Refactoring, readme.