DRY and trim