refactor & blacklist