Defactor global settings vars to match legacy approach