antoniop
committed
on 13 Jun 18
Remove duplicated queries and logic, simplify idioms