Some cleanup of variables in docs