[#64432566] Clean up variable names and error printing