update var names & comments