base: code cleanup

Change-Id: I48fec4bcff62de7b673fa8738668e70e5f7ee76a