Laboratory refactor