Cleanup of unused comments
Cleanup of unused comments, rename variable for clarity.