Clean up to use my_vars properly