Consolodate var stmts for simplicity
Standardize variable names.