Minor whitespace, comment, variable cleanup

Change-Id: I0c603573f7f047598aee1268aaba0d16427546a9