base: Code cleanup

Change-Id: I5f5667d8f04fbefaba79c466a125d166dd8ed205