Code cleanup
WIP cleanup?
Trying (and failing) at unifying browser error display