Refactor: where clauses + tuple indexing + if let