var names and comment clean up