Fix some nits while reading the code

Test: None
Change-Id: Id231a497ad1c27de257f9e9f02f8373c5c67a68d
4 files changed