Findings confirmations refactor