Tweaks for debugging and variable names