Blocked warning refactor