Refactoring + tip in README.