Cleaned up browser component code