Refactorings to Gopher to allow for embedding