minor trace move and comment cleanup