base: code cleanup

Change-Id: Iebd1ff6db8e90a34c99c5261b0f814ff82653512