more refactoring, parameterized cfn-derived hostname