Refactors initialization from the FirefoxCom

Fixes #1069