More cleanup of variables and comments