Simplify variables and clean up comments

Not supposed to have any functional changes

Change-Id: Ibb16af9144f183d85b985bcb3133a4244e310cda
Merge "Simplify variables and clean up comments"