cleanup and comment fix