Commenting 2:30 10/1

Also some cleanup for var declarations.