cleaned up activator code