Consolidated the common date scopes in the same vein as Katharina's work
Simplified the last_30_days scope