Do some cosmetic cleanup while reviewing the files. No functional changes.
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>