base: Code cleanup

Change-Id: Ib535885428055f83e40034b97c3a42654dfb7d94