minor cleanup and comment changes