[TASK] Clean up object access via global variables