base: code cleanup

Change-Id: I7064d5c2f974278dbe1fa50379f640a10a6ba262