TODO refact finder