Move safeword code to listener