Var name bug fix. Lint cleanup