More comment cleanup

Standardize pre-script variable declarations