Spacing and variable fix

Spacing and variable fix