base: Code Cleanup

Change-Id: I0e6af875ee8364cdc0e679e471f4c2ae104002d4