Limited refactoring.

Trying to test a hyperlink launch via user interaction. A headless browser would be easier and will be implemented.