base: code cleanup

Change-Id: I1575f67d40489e63642a967314597ce76b442270