Extract out smaller methods to clarify code
Add a `Browser` spec instead