Refactored to eliminate helloworld references.