reducing spaghetti level in ios-compile; no contentful change