base: code cleanup

Change-Id: I701e0954a919777a66602caa8802f0f7a088297a