Sent worldfactory through the style converter
Removed ternary operation out to a separate variable so it is not evaluated inside of a function call.