base: Code cleanup

Change-Id: I9fbb96137928623c0b9f76850e863a24725b5301