Revise comments for restructure of variable handling