Refactoring, local tests, README extended