Minor cleanup of browser and console form