Slightly rearranged lines to execute only what's really needed. No functional changes.