variable cleanup and comment