Refactor activate