Some refactoring
Restoring from a failed experiment