minor vars and comment clean up