Minor variable renaming, comment edits, remove some test statments.