Smaller methods

Paves the way for easier refactorisation and hacking via monkeypatches or using the browser details message in exceptions.