Refactored experiment design