Cleanup user data variable names and debug messages