Browser: code cleanup

Change-Id: I0563b05878ef3911a5d2dfc1c260562f2e5709bb