cleanup and comment