Refactoring
Document and test FxA