cleanup variable names & documentation