Minor cleanup

Don't look for the summer unless we need it. Move a val closer to usage.