Some minor code cleanup

Change-Id: I926affd3bdb4a07c1524a425a686404579bf6182
2 files changed