Variable Cleanup

Removes duplicate uses of `var` and uses `,` operator instead.