base: code cleanup

Change-Id: I80edc2dd73afc93f3a1d0f4c4f5e74e45c9aa8ea