scope cleanups
use merges to standardize queries and use objects rather than object.id to prevent nil problems
source code cleanup - remove unnecessary double quotes
rename expires column to expires_at
switch to stabby lambda syntax