Rename vars, add docstring, remove abbrevs